From: bors <bors@rust-lang.org>
Date: Mon, 2 Apr 2018 21:50:59 +0000 (+0000)
Subject: Auto merge of #5281 - matklad:cleanup, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~106
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=e06b964865c87e91c1710e76143bfdf9723044db;p=cargo.git

Auto merge of #5281 - matklad:cleanup, r=alexcrichton

Cleanup

Hopefully the last round of `conext` refactoring :-)

r? @alexcrichton
---

e06b964865c87e91c1710e76143bfdf9723044db